Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
92c0612a90
|
@ -39,6 +39,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
.Select(x => new GetTrialClinicalQuestionCalculateRelationOutDto()
|
.Select(x => new GetTrialClinicalQuestionCalculateRelationOutDto()
|
||||||
{
|
{
|
||||||
QuestionId = x.Id,
|
QuestionId = x.Id,
|
||||||
|
DigitPlaces=x.DigitPlaces,
|
||||||
QuestionName = x.QuestionName,
|
QuestionName = x.QuestionName,
|
||||||
CustomCalculateMark = x.CustomCalculateMark,
|
CustomCalculateMark = x.CustomCalculateMark,
|
||||||
CalculateQuestionList = x.CalculateQuestionList,
|
CalculateQuestionList = x.CalculateQuestionList,
|
||||||
|
|
|
@ -22,6 +22,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
{
|
{
|
||||||
public Guid QuestionId { get; set; }
|
public Guid QuestionId { get; set; }
|
||||||
|
|
||||||
|
public int? DigitPlaces { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 问题名称
|
/// 问题名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -101,10 +101,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
if (unit == ValueUnit.Custom)
|
if (unit == ValueUnit.Custom)
|
||||||
{
|
{
|
||||||
return answer + customUnit;
|
return answer + string.Empty + customUnit;
|
||||||
}
|
}
|
||||||
|
|
||||||
return answer + unitDataList.Where(y => y.Unit == unit).Select(x => x.UnitName).FirstIsNullReturnEmpty();
|
return answer +string.Empty + unitDataList.Where(y => y.Unit == unit).Select(x => x.UnitName).FirstIsNullReturnEmpty();
|
||||||
}
|
}
|
||||||
public string GetEntityAuditOpt(EntityEntry entityEntry)
|
public string GetEntityAuditOpt(EntityEntry entityEntry)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue