Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8
continuous-integration/drone/push Build is running
Details
continuous-integration/drone/push Build is running
Details
commit
2d2f399601
Binary file not shown.
Binary file not shown.
|
|
@ -181,6 +181,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
|
|
||||||
public string OneDoctorSignTime { get; set; } = string.Empty;
|
public string OneDoctorSignTime { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
public string OneDoctorSign { get; set; } = string.Empty;
|
||||||
|
|
||||||
public string TwoVisitName { get; set; } = string.Empty;
|
public string TwoVisitName { get; set; } = string.Empty;
|
||||||
|
|
||||||
public string TwoCheckDate { get; set; } = string.Empty;
|
public string TwoCheckDate { get; set; } = string.Empty;
|
||||||
|
|
@ -200,6 +202,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
|
|
||||||
public string TwoDoctorSignTime { get; set; } = string.Empty;
|
public string TwoDoctorSignTime { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
public string TwoDoctorSign { get; set; } = string.Empty;
|
||||||
|
|
||||||
public string ThreeVisitName { get; set; } = string.Empty;
|
public string ThreeVisitName { get; set; } = string.Empty;
|
||||||
|
|
||||||
public string ThreeCheckDate { get; set; } = string.Empty;
|
public string ThreeCheckDate { get; set; } = string.Empty;
|
||||||
|
|
@ -217,6 +221,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public string ThreeOverallResult { get; set; } = string.Empty;
|
public string ThreeOverallResult { get; set; } = string.Empty;
|
||||||
|
|
||||||
public string ThreeDoctorSignTime { get; set; } = string.Empty;
|
public string ThreeDoctorSignTime { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
public string ThreeDoctorSign { get; set; } = string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ExportVisitData
|
public class ExportVisitData
|
||||||
|
|
|
||||||
|
|
@ -233,11 +233,28 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
if (i >= forCount - 1)
|
if (i >= forCount - 1)
|
||||||
{
|
{
|
||||||
export.IsLastPage = true;
|
export.IsLastPage = true;
|
||||||
|
// 之后最后一个任务需要签名
|
||||||
|
var thisVisitListNum = export.VisitList.Count();
|
||||||
|
switch (thisVisitListNum)
|
||||||
|
{
|
||||||
|
case 1:
|
||||||
|
export.Lesion.OneDoctorSign = "签字:";
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
export.Lesion.TwoDoctorSign = "签字:";
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
export.Lesion.ThreeDoctorSign = "签字:";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
resultdata.Add(export);
|
resultdata.Add(export);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var value = new
|
var value = new
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue