From 417f3211ca9e0eec53245ee9b12f846110d357cd Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 14 Sep 2022 09:59:26 +0800
Subject: [PATCH] =?UTF-8?q?Url=20=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 20 +++++++++++++++++++
.../Service/Allocation/VisitTaskService.cs | 2 +-
.../Common/DTO/FrontAuditConfigViewModel.cs | 9 ++++++++-
.../Inspection/FrontAuditConfigService.cs | 3 +++
IRaCIS.Core.Domain/Common/FrontAuditConfig.cs | 16 +++++++++++++++
5 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 07e039f27..db6ccf882 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2890,6 +2890,26 @@
标准ID
+
+
+ 靶病灶
+
+
+
+
+ 非靶病灶
+
+
+
+
+ 新病灶
+
+
+
+
+ 整体疗效
+
+
表格问题类型
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index ae3259b3c..898665590 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -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)
{
diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
index e51ea5c26..ad9d9d1b2 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
@@ -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 TableConfigList { get; set; } = new List();
}
diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
index 4cb401981..cf5c631c6 100644
--- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
@@ -905,6 +905,7 @@ namespace IRaCIS.Core.Application.Service
foreach (var item in list)
{
item.TableConfigList = JsonConvert.DeserializeObject>(item.TableConfigJsonStr) ?? new List();
+ item.UrlConfig = JsonConvert.DeserializeObject(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);
diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
index 5aaf66e79..1ca03d8a3 100644
--- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
+++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
@@ -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
{
///
@@ -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 ParameterList { get; set; } = new List();
}
public class TableConfig