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

国际化

Uat_Study
hang 2023-07-12 09:03:50 +08:00
parent bbbc9da76e
commit 03810e0093
4 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -7,7 +7,7 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
WORKDIR /app
EXPOSE 7050
EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
@ -21,7 +21,6 @@ COPY ["IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj", "IRaCIS.Co
RUN dotnet restore "IRaCIS.Core.API/IRaCIS.Core.API.csproj"
COPY . .
WORKDIR "/src/IRaCIS.Core.API"
RUN dotnet build "IRaCIS.Core.API.csproj" -c Release -o /app/build
FROM build AS publish
RUN dotnet publish "IRaCIS.Core.API.csproj" -c Release -o /app/publish /p:UseAppHost=false
@ -33,3 +32,4 @@ COPY --from=publish /app/publish .
ENV ASPNETCORE_ENVIRONMENT=Development
ENTRYPOINT ["dotnet", "IRaCIS.Core.API.dll"]

5
IRaCIS.Core.Application/Service/Visit/SubjectService.cs
View File

@ -46,8 +46,6 @@ namespace IRaCIS.Application.Services
};
Subject? mapedSubject = null;
if (subjectCommand.Id == null) //insert
@ -136,8 +134,6 @@ namespace IRaCIS.Application.Services
}
/// <summary>
/// 计划外访视 获取受试者选择下拉框列表
/// </summary>
@ -156,7 +152,6 @@ namespace IRaCIS.Application.Services
Status = u.Status,
FirstGiveMedicineTime = u.FirstGiveMedicineTime
});
return query.ToList();
}

21
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
View File

@ -10,6 +10,7 @@ using IRaCIS.Core.Infrastructure;
using IRaCIS.Core.Application.Auth;
using IRaCIS.Core.Infra.EFCore.Common;
using MassTransit;
using IRaCIS.Core.Domain.Models;
namespace IRaCIS.Core.Application.Services
{
@ -100,6 +101,8 @@ namespace IRaCIS.Core.Application.Services
};
var triconfig = await _trialRepository.Where(t => t.Id == svCommand.TrialId).Select(u => new { u.IsEnrollementQualificationConfirm, u.IsPDProgressView }).FirstOrDefaultAsync();
svCommand.BlindName = "B" + ((int)(svCommand.VisitNum * 10)).ToString("D3");
svCommand.VisitExecuted = svCommand.IsLostVisit ? VisitExecutedEnum.Executed : svCommand.VisitExecuted;
@ -128,24 +131,10 @@ namespace IRaCIS.Core.Application.Services
}
svCommand.PDState = svCommand.IsBaseLine == false && triconfig.IsPDProgressView ? PDStateEnum.PDProgress : PDStateEnum.None;
dbBeforeEntity = await _subjectVisitRepository.InsertFromDTOAsync(svCommand, false, verifyExp1, verifyExp2, verifyExp3);
//var cRCClinicalDataIds = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == svCommand.TrialId && x.UploadRole == UploadRole.CRC && x.IsConfirm && x.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
//.Select(x => x.Id).ToListAsync();
//List<ReadingClinicalData> readingClinicals = cRCClinicalDataIds.Select(x => new ReadingClinicalData()
//{
// ClinicalDataTrialSetId = x,
// IsVisit = true,
// SubjectId = svCommand.SubjectId,
// ReadingId = dbBeforeEntity.Id,
// TrialId = svCommand.TrialId
//}).ToList();
//await _readingClinicalDataRepository.AddRangeAsync(readingClinicals);
}
else

5
IRaCIS.Core.Application/Triggers/AddSubjectTrigger.cs
View File

@ -45,7 +45,7 @@ namespace IRaCIS.Core.Application.Triggers
var svList = _mapper.Map<List<SubjectVisit>>(visitPlanList);
var IsEnrollementQualificationConfirm = await _trialRepository.Where(t => t.Id == subject.TrialId).Select(u => u.IsEnrollementQualificationConfirm).FirstOrDefaultAsync();
var triconfig = await _trialRepository.Where(t => t.Id == subject.TrialId).Select(u => new { u.IsEnrollementQualificationConfirm,u.IsPDProgressView }).FirstOrDefaultAsync();
@ -57,7 +57,8 @@ namespace IRaCIS.Core.Application.Triggers
t.SubjectId = subject.Id;
t.TrialId = subject.TrialId;
t.SiteId = subject.SiteId;
t.IsEnrollmentConfirm = t.IsBaseLine ? IsEnrollementQualificationConfirm : false;
t.IsEnrollmentConfirm = t.IsBaseLine ? triconfig.IsEnrollementQualificationConfirm : false;
t.PDState = t.IsBaseLine==false && triconfig.IsPDProgressView ? PDStateEnum.PDProgress : PDStateEnum.None;
t.Id = NewId.NextGuid();
});