导出修改
parent
b576478eea
commit
5cc192b317
|
|
@ -92,7 +92,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
List<TargetInfo> targets=new List<TargetInfo>();
|
||||
|
||||
var index = 0;
|
||||
foreach (var item in VisitOne.VisitTargetInfoList)
|
||||
foreach (var item in VisitList.Last().VisitTargetInfoList)
|
||||
{
|
||||
TargetInfo targetInfo = new TargetInfo()
|
||||
{
|
||||
|
|
@ -122,7 +122,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
List<TargetInfo> targets = new List<TargetInfo>();
|
||||
|
||||
var index = 0;
|
||||
foreach (var item in VisitOne.VisitNoTargetInfoList)
|
||||
foreach (var item in VisitList.Last().VisitNoTargetInfoList)
|
||||
{
|
||||
TargetInfo targetInfo = new TargetInfo()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
{ "SubjectName",subjectInfo.ShortName }, //患者姓名
|
||||
{ "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别
|
||||
{ "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄
|
||||
{ "SubjectCode",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).FirstIsNullReturnEmpty() }, //患者编号
|
||||
{ "SubjectCode",string.Join(",",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).ToList()) }, //患者编号
|
||||
{ "VisitName",visitInfo.VisitName }, //访视名称
|
||||
{ "LatestScanDate",visitInfo.StudyList.Min(x=>x.StudyTime)?.ToString("yyyy-MM-dd") }, //随访日期
|
||||
{ "CriterionName",taskinfo.TrialReadingCriterion.CriterionName }, //评估标准
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
|
||||
var researchProgramNo = subjectInfo.Trial.ResearchProgramNo;
|
||||
var subjectName = subjectInfo.ShortName;
|
||||
var subjectCode = subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).FirstIsNullReturnEmpty();
|
||||
var subjectCode = string.Join(",", subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).ToList()); //患者编号;
|
||||
|
||||
|
||||
|
||||
|
|
@ -442,7 +442,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
{ "SubjectName",subjectInfo.ShortName }, //患者姓名
|
||||
{ "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别
|
||||
{ "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄
|
||||
{ "SubjectCode",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).FirstIsNullReturnEmpty() }, //患者编号
|
||||
{ "SubjectCode",string.Join(",",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).ToList()) }, //患者编号
|
||||
{ "VisitName",visitInfo.VisitName }, //访视名称
|
||||
{ "LatestScanDate",visitInfo.StudyList.Min(x=>x.StudyTime)?.ToString("yyyy-MM-dd") }, //随访日期
|
||||
{ "CriterionName",taskinfo.TrialReadingCriterion.CriterionName }, //评估标准
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
{ "SubjectName",subjectInfo.ShortName }, //患者姓名
|
||||
{ "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别
|
||||
{ "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄
|
||||
{ "SubjectCode",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).FirstIsNullReturnEmpty() }, //患者编号
|
||||
{ "SubjectCode",string.Join(",",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).ToList()) }, //患者编号
|
||||
{ "VisitName",visitInfo.VisitName }, //访视名称
|
||||
{ "LatestScanDate",visitInfo.StudyList.Min(x=>x.StudyTime)?.ToString("yyyy-MM-dd") }, //随访日期
|
||||
{ "CriterionName",taskinfo.TrialReadingCriterion.CriterionName }, //评估标准
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
|
||||
var researchProgramNo = subjectInfo.Trial.ResearchProgramNo;
|
||||
var subjectName = subjectInfo.ShortName;
|
||||
var subjectCode = subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).FirstIsNullReturnEmpty();
|
||||
var subjectCode = string.Join(",", subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).ToList()); //患者编号;
|
||||
|
||||
|
||||
|
||||
|
|
@ -457,7 +457,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
{ "SubjectName",subjectInfo.ShortName }, //患者姓名
|
||||
{ "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别
|
||||
{ "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄
|
||||
{ "SubjectCode",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).FirstIsNullReturnEmpty() }, //患者编号
|
||||
{ "SubjectCode",string.Join(",",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).ToList()) }, //患者编号
|
||||
{ "VisitName",visitInfo.VisitName }, //访视名称
|
||||
{ "LatestScanDate",visitInfo.StudyList.Min(x=>x.StudyTime)?.ToString("yyyy-MM-dd") }, //随访日期
|
||||
{ "CriterionName",taskinfo.TrialReadingCriterion.CriterionName }, //评估标准
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
|
||||
var researchProgramNo = subjectInfo.Trial.ResearchProgramNo;
|
||||
var subjectName = subjectInfo.ShortName;
|
||||
var subjectCode = subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).FirstIsNullReturnEmpty();
|
||||
var subjectCode = string.Join(",", subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).ToList()); //患者编号;
|
||||
|
||||
|
||||
|
||||
|
|
@ -452,7 +452,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
{ "SubjectName",subjectInfo.ShortName }, //患者姓名
|
||||
{ "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别
|
||||
{ "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄
|
||||
{ "SubjectCode",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).FirstIsNullReturnEmpty() }, //患者编号
|
||||
{ "SubjectCode",string.Join(",",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).ToList()) }, //患者编号
|
||||
{ "VisitName",visitInfo.VisitName }, //访视名称
|
||||
{ "LatestScanDate",visitInfo.StudyList.Min(x=>x.StudyTime)?.ToString("yyyy-MM-dd") }, //随访日期
|
||||
{ "CriterionName",taskinfo.TrialReadingCriterion.CriterionName }, //评估标准
|
||||
|
|
|
|||
Loading…
Reference in New Issue