修改中心调研

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -154,7 +154,6 @@ namespace IRaCIS.Core.Application.ViewModel
         public string FirstAuditUserName { get; set; }
         public DateTime? FirstAuditTime { get; set; }
 
-        public int AuditResultEnum { get; set; }
 
         public Guid? LatestReplyUserId { get; set; }
 

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -217,7 +217,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
                .WhereIf(queryVisitTask.FirstAuditTimeEnd != null, t => t.AllocateTime < queryVisitTask.FirstAuditTimeEnd)
                .WhereIf(queryVisitTask.LatestReplyTimeBegin != null, t => t.AllocateTime > queryVisitTask.LatestReplyTimeBegin)
                .WhereIf(queryVisitTask.LatestReplyTimeEnd != null, t => t.AllocateTime < queryVisitTask.LatestReplyTimeEnd)
-               .WhereIf(queryVisitTask.AuditResultEnum != null, t => t.AuditResultEnum == queryVisitTask.AuditResultEnum)
 
 
                ;

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -736,7 +736,7 @@ namespace IRaCIS.Core.Application.Contracts
 
             var trialSiteSurvey = (await _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId).FirstOrDefaultAsync()).IfNullThrowException();
 
-            var siteUserList = await _trialSiteUserSurveyRepository.Where(t => t.TrialSiteSurvey.SiteId == trialSiteSurvey.SiteId && t.TrialSiteSurvey.IsDeleted==false).Select(t => new { t.TrialSiteSurveyId, t.IsGenerateAccount, t.IsGenerateSuccess, t.UserTypeId,
+            var siteUserList = await _trialSiteUserSurveyRepository.Where(t => t.TrialSiteSurvey.TrialId==trialId && t.TrialSiteSurvey.SiteId == trialSiteSurvey.SiteId && t.TrialSiteSurvey.IsDeleted==false).Select(t => new { t.TrialSiteSurveyId, t.IsGenerateAccount, t.IsGenerateSuccess, t.UserTypeId,
                 UserTypeEnum=   (UserTypeEnum?) t.UserTypeRole.UserTypeEnum , t.TrialRoleName.Code }).ToListAsync();
 
 
@@ -748,7 +748,7 @@ namespace IRaCIS.Core.Application.Contracts
                 {
                     var currentUserList = siteUserList.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId).ToList();
 
-                    if(!currentUserList.Any(t=>t.Code=="1")|| !currentUserList.Any(t => t.Code == "4"))
+                    if(!currentUserList.Any(t=>t.Code=="1") || !currentUserList.Any(t => t.Code == "4"))
                     {
                         throw new BusinessValidationFailedException("本次提交，必须有CRC和影像负责人信息");
                     }

IRaCIS.Core.Domain/Allocation/PIAudit.cs

@@ -0,0 +1,54 @@
+
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2023-07-10 15:14:16 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace IRaCIS.Core.Domain.Models
+{
+	 ///<summary>
+	 ///PIAudit
+	 ///</summary>
+	 [Table("PIAudit")]	
+	 public class PIAudit : Entity, IAuditAdd
+	 {
+	 
+		/// <summary>
+        /// Id
+        /// </summary>
+		[Key]
+		[Required]
+		public Guid Id { get; set; }
+	
+		/// <summary>
+        /// PIAuditNote
+        /// </summary>
+		public string PIAuditNote { get; set; }
+	
+		/// <summary>
+        /// NotAgreeReason
+        /// </summary>
+		public string NotAgreeReason { get; set; }
+	
+		/// <summary>
+        /// PIAuditImagePath
+        /// </summary>
+		public string PIAuditImagePath { get; set; }
+	
+		/// <summary>
+        /// CreateUserId
+        /// </summary>
+		[Required]
+		public Guid CreateUserId { get; set; }
+	
+		/// <summary>
+        /// CreateTime
+        /// </summary>
+		[Required]
+		public DateTime CreateTime { get; set; }
+	 
+	 }
+}	 

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -376,8 +376,6 @@ namespace IRaCIS.Core.Domain.Models
         public Trial Trial { get; set; }
 
 
-        public PIAuditState PIAuditState { get; set; }
-
 
         //影像质量  等等第一层级问题答案
         [JsonIgnore]
@@ -426,6 +424,36 @@ namespace IRaCIS.Core.Domain.Models
             }
         }
 
+        public string NotAgreeReason { get; set; }
+        public string PIAuditNote { get; set; } = string.Empty;
+
+        public string PIAuditImagePath { get; set; }
+
+        [NotMapped]
+        public List<string> PIAuditImagePathList
+        {
+            get
+            {
+
+                try
+                {
+                    return this.PIAuditImagePath.Trim().Split('|').ToList();
+                }
+                catch (Exception)
+                {
+
+                    return new List<string>();
+                }
+
+            }
+        }
+
+
+        public PIAuditState PIAuditState { get; set; }
+      
+
+
+
         [JsonIgnore]
         public User FirstAuditUser { get; set; }
 
@@ -436,8 +464,6 @@ namespace IRaCIS.Core.Domain.Models
         public Guid? FirstAuditUserId { get; set; }
         public DateTime? FirstAuditTime { get; set; }
 
-        public int AuditResultEnum { get; set; }
-
         public Guid? LatestReplyUserId { get;set; }
         public DateTime? LatestReplyTime { get; set; }
 

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -782,6 +782,8 @@ namespace IRaCIS.Core.Infra.EFCore
 
         public virtual DbSet<Internationalization> Internationalization { get; set; }
 
+        public virtual DbSet<PIAudit> PIAudit { get; set; }
+
 
     }
 

IRaCIS.Core.Test/DbHelper.ttinclude

@@ -2,9 +2,9 @@
 	public class config
 	{
         public static readonly string ConnectionString = "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true";
-        public static readonly string DbDatabase = "IRaCIS_New_Tet";
+        public static readonly string DbDatabase = "CenterImage_Test";
         //表名称用字符串,拼接
-        public static readonly string TableName = "ReadModuleCriterionFrom";
+        public static readonly string TableName = "PIAudit";
         //具体文件里面  例如service 可以配置是否分页
 	}
 #>