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

Url 配置字段增加

Uat_Study
hang 2022-09-14 09:59:26 +08:00
parent af9394ee0c
commit 417f3211ca
5 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -2890,6 +2890,26 @@
标准ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTumorAssessmentListInDto.TargetLesion">
<summary>
靶病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTumorAssessmentListInDto.NonTargetLesions">
<summary>
非靶病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTumorAssessmentListInDto.NewLesion">
<summary>
新病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTumorAssessmentListInDto.OverallEfficacy">
<summary>
整体疗效
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemQuery.TableQuestionType">
<summary>
表格问题类型

2
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -1782,7 +1782,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
newTask.SuggesteFinishedTime = DateTime.Now.AddDays(7);
//拷贝表单
if (visitTaskReReadingAppply.IsCopyOrigenalForms)
if ( (visitTaskReReadingAppply.IsCopyOrigenalForms && origenalTask.VisitTaskNum==influenceTask.VisitTaskNum)|| (visitTaskReReadingAppply.IsCopyFollowForms && origenalTask.VisitTaskNum != influenceTask.VisitTaskNum))
{
if (origenalTask.ReadingCategory == ReadingCategory.Visit)
{

9
IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
View File

@ -280,9 +280,16 @@ namespace IRaCIS.Core.Application.ViewModel
public string InterfaceName { get; set; } = string.Empty;
//byzhouahng
public string TableConfigJsonStr { get; set; }
public string UrlConfigJsonStr { get; set; } = String.Empty;
public UrlConfig UrlConfig { get; set; }
public List<TableConfig> TableConfigList { get; set; } = new List<TableConfig>();
}

3
IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
View File

@ -905,6 +905,7 @@ namespace IRaCIS.Core.Application.Service
foreach (var item in list)
{
item.TableConfigList = JsonConvert.DeserializeObject<List<TableConfig>>(item.TableConfigJsonStr) ?? new List<TableConfig>();
item.UrlConfig = JsonConvert.DeserializeObject<UrlConfig>(item.UrlConfigJsonStr) ?? new UrlConfig();
}
return list;
@ -948,6 +949,7 @@ namespace IRaCIS.Core.Application.Service
{
Sort = lst.Select(x => x.Sort).FirstOrDefault(),
TableConfigJsonStr= lst.Select(x => x.TableConfigJsonStr).FirstOrDefault(),
UrlConfigJsonStr=lst.Select(x => x.UrlConfigJsonStr).FirstOrDefault(),
IsShowByTrialConfig = lst.Select(x => x.IsShowByTrialConfig).FirstOrDefault(),
TrialConfigRelyFieldName = lst.Select(x => x.TrialConfigRelyFieldName).FirstOrDefault(),
Code = lst.Max(x => x.Code),
@ -1158,6 +1160,7 @@ namespace IRaCIS.Core.Application.Service
}
addOrEditFrontAuditConfig.TableConfigJsonStr = JsonConvert.SerializeObject(addOrEditFrontAuditConfig.TableConfigList);
addOrEditFrontAuditConfig.UrlConfigJsonStr = JsonConvert.SerializeObject(addOrEditFrontAuditConfig.UrlConfig);
var entity = await _frontAuditConfigRepository.InsertOrUpdateAsync(addOrEditFrontAuditConfig, true);

16
IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
View File

@ -7,6 +7,8 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -215,8 +217,22 @@ namespace IRaCIS.Core.Domain.Models
public string TableConfigJsonStr { get; set; } = String.Empty;
public string UrlConfigJsonStr { get; set; } = String.Empty;
}
public class UrlConfig
{
public bool IsRoute { get; set; }
public string RoutePath { get; set; }
public bool IsHaveParameters { get; set; }
public List<string> ParameterList { get; set; } = new List<string>();
}
public class TableConfig