Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

2023-07-05 10:33:57 +08:00
parent d00158fa38 4a6dfc9a2a
commit ddcd9cb0c1
4 changed files with 56 additions and 16 deletions
@@ -100,8 +100,11 @@ namespace IRaCIS.Core.Domain.Models
        [JsonIgnore]
        public List<TrialClinicalDataSetCriterion> TrialClinicalDataSetCriteriaList { get; set; }

+		[JsonIgnore]
+		public List<TrialClinicalQuestion> TrialClinicalQuestionList { get; set; }

-        public string CriterionEnumListStr { get; set; } = String.Empty;
+
+		public string CriterionEnumListStr { get; set; } = String.Empty;

        public List<int> CriterionEnumList => CriterionEnumListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t) && int.TryParse(t.Trim(), out var s)).Select(t => int.Parse(t.Trim())).ToList();

@@ -162,7 +162,11 @@ namespace IRaCIS.Core.Domain.Models
        /// 单位
        /// </summary>
        public string Unit { get; set; } = string.Empty;
-    }
+
+		[JsonIgnore]
+		[ForeignKey("TrialClinicalId")]
+		public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
+	}


 }