IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs

@@ -242,8 +242,6 @@ namespace IRaCIS.Application.Contracts
 
     public class ConfirmationReviewerDTO : DoctorOptDTO
     {
-        public Guid DoctorId { get; set; }
-
         public int DoctorTrialState { get; set; }
         public string OptUserName { get; set; } = string.Empty;
 
@@ -251,11 +249,6 @@ namespace IRaCIS.Application.Contracts
         public DateTime? OptTime { get; set; }
         public string? OptTimeStr => OptTime?.ToString("yyyy-MM-dd HH:mm:ss");
 
-        public UserTypeEnum? AuditTypeEnum { get; set; }
-        public DateTime? AuditTime { get; set; }
-        public string AuditUserName { get; set; } = string.Empty;
-        public string? AuditTimeStr => AuditTime?.ToString("yyyy-MM-dd HH:mm:ss");
-
         //SPM  需要看到
         public DateTime? SubmmitTime { get; set; }
         public string SubmmitUserName { get; set; } = string.Empty;

IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs

@@ -337,29 +337,14 @@ namespace IRaCIS.Core.Application.Service
             doctorPageList.CurrentPageData.ToList().ForEach(u =>
             {
                 u.DoctorTrialState = (int)EnrollStatus.InviteIntoGroup;
-               
-                var lastState= enrollStateList.OrderByDescending(x=>x.OptTime).FirstOrDefault(t => t.DoctorId == u.Id);
-                if (lastState != null)
-                {
-                    u.DoctorTrialState = lastState.IntoGroupState;
-                }
-                var opt = enrollStateList.Where(x => x.IntoGroupState == 10).FirstOrDefault(t => t.DoctorId == u.Id);
+                var opt = enrollStateList.OrderByDescending(x=>x.OptTime).FirstOrDefault(t => t.DoctorId == u.Id);
                 if (opt != null)
                 {
-                
+                    u.DoctorTrialState = opt.IntoGroupState;
                     u.OptTime = opt.OptTime;
                     u.UserTypeEnum = opt.UserTypeEnum;
                     u.OptUserName = opt.OptUserName;
                 }
-
-                var approved = enrollStateList.Where(x => x.IntoGroupState == 8).FirstOrDefault(t => t.DoctorId == u.Id);
-
-                if (approved != null)
-                {
-                    u.AuditTime = approved.OptTime;
-                    u.AuditTypeEnum = approved.UserTypeEnum;
-                    u.AuditUserName = approved.OptUserName;
-                }
             });
 
             return doctorPageList;