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

copy功能新增复制value

Browse Source
This commit is contained in:
he
2022-04-08 18:02:23 +08:00
parent 2a1f15996d
commit 5241e62fe3
4 changed files with 86 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Visit/SubjectService.cs
+6 -4
View File
@@ -105,11 +105,11 @@ namespace IRaCIS.Application.Services
{
TrialId = subjectCommand.TrialId,
SiteId = subjectCommand.SiteId,
SubjectId = subjectCommand.Id,
SubjectId = mapedSubject.Id,
SubjectCode = subjectCommand.Code,
IsSign=false,
CreateTime = createtime,
Identification = "Subject|Init|Subject|Status",
Identification = "Init|Subject|Status|Subject",
JsonDetail= JsonConvert.SerializeObject(new {
Status= "OnVisit",
})
@@ -122,10 +122,11 @@ namespace IRaCIS.Application.Services
{
TrialId = subjectCommand.TrialId,
SiteId = subjectCommand.SiteId,
SubjectId = subjectCommand.Id,
SubjectId = mapedSubject.Id,
SubjectCode = subjectCommand.Code,
SubjectVisitId= item.Id,
SubjectVisitName=item.VisitName,
BlindName=item.BlindName,
IsSign = false,
CreateTime = visittime,
Identification = "Add|Visit|Info|Visit-Image Upload",
@@ -145,9 +146,10 @@ namespace IRaCIS.Application.Services
{
TrialId = subjectCommand.TrialId,
SiteId = subjectCommand.SiteId,
SubjectId = subjectCommand.Id,
SubjectId = mapedSubject.Id,
SubjectCode = subjectCommand.Code,
SubjectVisitId = item.Id,
BlindName = item.BlindName,
SubjectVisitName = item.VisitName,
IsSign = false,
CreateTime = visittime.AddSeconds(1),
IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
+39 -4
View File
@@ -9,6 +9,8 @@ using IRaCIS.Core.Application.MediatR.CommandAndQueries;
using Magicodes.ExporterAndImporter.Core;
using Magicodes.ExporterAndImporter.Excel;
using Magicodes.ExporterAndImporter.Excel.AspNetCore;
using IRaCIS.Core.Application.Service.Inspection.Interface;
using Newtonsoft.Json;
namespace IRaCIS.Application.Services
{
@@ -17,11 +19,13 @@ namespace IRaCIS.Application.Services
{
private readonly IRepository<VisitStage> _visitStageRepository;
private readonly IRepository<Trial> _trialRepository;
private readonly IInspectionService _inspectionService;
public VisitPlanService(IRepository<VisitStage> visitStageRepository,IRepository<Trial> trialRepository)
public VisitPlanService(IRepository<VisitStage> visitStageRepository,IRepository<Trial> trialRepository, IInspectionService inspectionService)
{
_visitStageRepository = visitStageRepository;
_trialRepository = trialRepository;
this._inspectionService = inspectionService;
}
@@ -77,6 +81,8 @@ namespace IRaCIS.Application.Services
[UnitOfWork]
public async Task<IResponseOutput> AddOrUpdateVisitStage(VisitPlanCommand visitPlan)
{
DateTime createtime = DateTime.Now;
List<DataInspection> datas = new List<DataInspection>();
if (!await _repository.Where<Trial>(t => t.Id == visitPlan.TrialId).IgnoreQueryFilters().AnyAsync(t => t.TrialStatusStr == StaticData.TrialOngoing || t.TrialStatusStr == StaticData.TrialInitializing))
{
return ResponseOutput.NotOk(" only in Initializing or Ongoing State can operate ");
@@ -108,7 +114,6 @@ namespace IRaCIS.Application.Services
}
}
if (visitPlan.Id == Guid.Empty || visitPlan.Id == null)//add
{
@@ -136,13 +141,40 @@ namespace IRaCIS.Application.Services
svItem.SiteId = subject.SiteId;
svItem.SubjectId = subject.SubjectId;
svItem.Id = Guid.NewGuid();
//设置了末次访视，那么加访视计划的时候，设置为不可用
if (subjectSVS.Any(t => t.SubjectId == svItem.SubjectId && t.IsFinalVisit))
{
svItem.VisitExecuted = VisitExecutedEnum.Unavailable;
}
datas.Add(new DataInspection()
{
SubjectVisitId = svItem.Id,
SubjectVisitName = svItem.VisitName,
BlindName = visitPlan.BlindName,
Identification = "Add|Visit|Info|Visit-Image Upload",
SiteId = svItem.SiteId,
TrialId = svItem.TrialId,
SubjectId = svItem.SubjectId,
IsSign = false,
CreateTime = createtime,
JsonDetail = JsonConvert.SerializeObject(svItem)
});
datas.Add(new DataInspection()
{
SubjectVisitId = svItem.Id,
SubjectVisitName = svItem.VisitName,
BlindName = visitPlan.BlindName,
Identification = "Add|Visit|Info|Visit-Image Upload",
SiteId = svItem.SiteId,
TrialId = svItem.TrialId,
SubjectId = svItem.SubjectId,
IsSign = false,
CreateTime = createtime.AddSeconds(1),
JsonDetail = JsonConvert.SerializeObject(svItem)
});
await _repository.AddAsync(svItem);
}
}
@@ -159,7 +191,7 @@ namespace IRaCIS.Application.Services
await _repository.SaveChangesAsync();
return ResponseOutput.Ok(result.Id.ToString());
//return ResponseOutput.Ok(result.Id.ToString());
}
@@ -201,9 +233,12 @@ namespace IRaCIS.Application.Services
await _repository.SaveChangesAsync();
return ResponseOutput.Ok();
//return ResponseOutput.Ok();
}
await _inspectionService.AddListInspectionRecordAsync(datas);
return ResponseOutput.Ok();
}
/// <summary> 删除项目计划某一项[New]</summary>