diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index e2d1c83d..93700823 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -65,6 +65,13 @@
+
+
+ 修改排序
+
+
+
+
新增或者修改
diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
index 5fba1556..b6d55098 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 SortData { get; set; }
}
public class FrontAuditSort
{
- //public Guid
+ public Guid Id { get; set; }
+
+ public int Sort { get; set; }
+
}
/// FrontAuditConfigAddOrEdit 列表查询参数模型
diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
index 49d231ed..be8b26df 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 ChangeFrontAuditSort()
- //{
- // _frontAuditConfigRepository.UpdateFromQueryAsync(x=>)
- //}
+
+ ///
+ /// 修改排序
+ ///
+ ///
+ ///
+ public async Task 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();
+ }
///
/// 新增或者修改
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs
index 9d45adc8..872b01d0 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);
}