From a17dc00ca8785218e23653ddefde2634c6f9d5d9 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 7 Apr 2022 15:09:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               |  7 ++++++
 .../Common/DTO/FrontAuditConfigViewModel.cs   |  7 ++++--
 .../Service/Common/FrontAuditConfigService.cs | 22 +++++++++++++---
 .../Service/Visit/SubjectService.cs           | 25 +++++++++++++++++++
 4 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index e2d1c83dc..93700823d 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -65,6 +65,13 @@
             <param name="iq"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.ChangeFrontAuditSort(IRaCIS.Core.Application.ViewModel.ChangeFrontAuditSortDto)">
+            <summary>
+            修改排序
+            </summary>
+            <param name="sortDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.AddOrUpdateFrontAuditConfig(IRaCIS.Core.Application.ViewModel.FrontAuditConfigAddOrEdit)">
             <summary>
             新增或者修改
diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
index 5fba15563..b6d55098c 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
@@ -118,12 +118,15 @@ namespace IRaCIS.Core.Application.ViewModel
 
     public class ChangeFrontAuditSortDto
     {
-        
+        public List<FrontAuditSort> SortData { get; set; }
     }
 
     public class FrontAuditSort
     {
-        //public Guid 
+        public Guid Id { get; set; }
+
+        public int Sort { get; set; }
+
     }
 
     ///<summary> FrontAuditConfigAddOrEdit  列表查询参数模型</summary>
diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
index 49d231eda..be8b26df8 100644
--- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
@@ -164,10 +164,24 @@ namespace IRaCIS.Core.Application.Service
             return await query.OrderBy(x=>x.Sort).ToListAsync();
         }
 
-        //public async Task<IResponseOutput> ChangeFrontAuditSort() 
-        //{
-        //    _frontAuditConfigRepository.UpdateFromQueryAsync(x=>)
-        //}
+
+        /// <summary>
+        /// 修改排序
+        /// </summary>
+        /// <param name="sortDto"></param>
+        /// <returns></returns>
+        public async Task<IResponseOutput> ChangeFrontAuditSort(ChangeFrontAuditSortDto sortDto)
+        {
+            foreach (var item in sortDto.SortData)
+            {
+                await _frontAuditConfigRepository.UpdateFromQueryAsync(x => x.Id == item.Id, x => new FrontAuditConfig
+                {
+                    Sort = item.Sort
+                });
+            }
+            await _frontAuditConfigRepository.SaveChangesAsync();
+            return ResponseOutput.Ok();
+        }
 
         /// <summary>
         /// 新增或者修改
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs
index 9d45adc82..872b01d03 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs
@@ -117,6 +117,31 @@ namespace IRaCIS.Application.Services
                     Status= "OnVisit",
                     })
                 });
+
+                var visittime = createtime.AddSeconds(1);
+                foreach (var item in mapedSubject.SubjectVisitList)
+                {
+                    datas.Add(new DataInspection()
+                    {
+                        TrialId = subjectCommand.TrialId,
+                        SiteId = subjectCommand.SiteId,
+                        SubjectId = subjectCommand.Id,
+                        SubjectCode = subjectCommand.Code,
+                        SubjectVisitId= item.Id,
+                        SubjectVisitName=item.VisitName,
+                        IsSign = false,
+                        CreateTime = createtime,
+                        Identification = "Subject|Init|Subject|Status",
+                        JsonDetail = JsonConvert.SerializeObject(new
+                        {
+                            VisitName = item.VisitName,
+                            VisitNum = item.VisitNum,
+                            IsBaseLine=item.IsBaseLine,
+                        })
+                    });
+                }
+                
+
                await  _inspectionService.AddListInspectionRecordAsync(datas);
             }