修改邮件发送和稽查

IRaCIS.Core.Application/Service/Document/EmailSendService.cs

@@ -190,7 +190,7 @@ namespace IRaCIS.Core.Application.Service
                      ReUploadTobeDealedCount = t.SubjectVisitList.SelectMany(c => c.QCChallengeList)
                      .Where(u => u.CreateUserId == userId && u.IsClosed == false && u.LatestReplyUser.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator && u.ReuploadEnum == QCChanllengeReuploadEnum.CRCRequestReupload).Count(),
 
-                     //质疑待处理
+                     //质疑待处理  发送邮件的时候 需要减去ReUploadTobeDealedCount  
                      ToBeDealedCount = t.SubjectVisitList.SelectMany(c => c.QCChallengeList)
                      .Where(u => u.CreateUserId == userId && u.IsClosed == false && u.LatestReplyUser.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Count(),
                  });
@@ -205,7 +205,8 @@ namespace IRaCIS.Core.Application.Service
                     {
                         var topicStr = string.Format(_userInfo.IsEn_Us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, trialInfo.ResearchProgramNo);
                         var htmlBodyStr = string.Format(_userInfo.IsEn_Us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN, 
-                            user.FullName, DateTime.Now, sendStat.ToBeDealedCount, sendStat.ReUploadTobeDealedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
+
+                            user.FullName, DateTime.Now, sendStat.ToBeDealedCount- sendStat.ReUploadTobeDealedCount, sendStat.ReUploadTobeDealedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
                         return (topicStr, htmlBodyStr);
                     };
 

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -919,10 +919,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     .Where(t => t.TrialEmailNoticeConfigId == entity.Id).Select(t =>
                 new { t.TrialEmailNoticeConfigId, t.EmailUserType, t.UserType }).ToList();
 
-                if (_userInfo.RequestUrl == "TrialEmailNoticeConfig/getTrialEmailNoticeConfigList")
+
-                {
-                    extraIdentification = "/Auto";
-                }
 
                 await InsertInspection<TrialEmailNoticeConfig>(entity, type, x => new InspectionConvertDTO()
                 {
@@ -1367,6 +1364,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             }
             #endregion
 
+            #region 中心调研
+
+
             // 中心调研表
             foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSiteSurvey)))
             {
@@ -1408,78 +1408,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 });
             }
 
+            #endregion
 
 
-            // 既往手术史
-            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousSurgery)))
-            {
-                var type = GetEntityAuditOpt(item);
 
-                var entity = item.Entity as PreviousSurgery;
-
-                await InsertInspection<PreviousSurgery>(entity, type, x => new InspectionConvertDTO()
-                {
-                    IsDistinctionInterface = false,
-
-                    SubjectVisitId = x.SubjectVisitId,
-
-                    ObjectRelationParentId = x.SubjectVisitId,
-
-                    ObjectRelationParentId2 = x.ClinicalDataTrialSetId,
-
-                }, new
-                {
-                    Type = ClinicalFileType.PreviousSurgery
-                });
-            }
-
-            // 既往放疗史
-            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousHistory)))
-            {
-
-                var type = GetEntityAuditOpt(item);
-
-                var entity = item.Entity as PreviousHistory;
-
-                await InsertInspection<PreviousHistory>(entity, type, x => new InspectionConvertDTO()
-                {
-
-
-                    IsDistinctionInterface = false,
-
-                    SubjectVisitId = x.SubjectVisitId,
-
-                    ObjectRelationParentId2 = x.ClinicalDataTrialSetId,
-
-                    ObjectRelationParentId = x.SubjectVisitId,
-                }, new
-                {
-                    Type = ClinicalFileType.PreviousHistory
-                });
-            }
-
-            // 其他治疗史
-            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousOther)))
-            {
-                var type = GetEntityAuditOpt(item);
-
-                var entity = item.Entity as PreviousOther;
-
-                await InsertInspection<PreviousOther>(entity, type, x => new InspectionConvertDTO()
-                {
-
-                    IsDistinctionInterface = false,
-
-                    SubjectVisitId = x.SubjectVisitId,
-
-                    ObjectRelationParentId2 = x.ClinicalDataTrialSetId,
-
-                    ObjectRelationParentId = x.SubjectVisitId,
-                }, new
-                {
-                    Type = ClinicalFileType.PreviousOther
-                });
-            }
 
             //系统  Qc 问题
             foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(QCQuestion)))
@@ -1567,6 +1499,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             }
 
 
+            #region 项目参与人员  项目site
+
+
 
             // 项目中心  Site未稽查
             foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSite)))
@@ -1636,6 +1571,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 });
             }
 
+            #endregion
 
             // 受试者
             foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(Subject)))
@@ -1778,6 +1714,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 );
             }
 
+            #region Dicom  非Dicom  既往手术史..临床数据
+
             // Dicom
             foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(DicomStudy)))
             {
@@ -1828,6 +1766,78 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 });
             }
 
+            // 既往手术史
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousSurgery)))
+            {
+                var type = GetEntityAuditOpt(item);
+
+                var entity = item.Entity as PreviousSurgery;
+
+                await InsertInspection<PreviousSurgery>(entity, type, x => new InspectionConvertDTO()
+                {
+                    IsDistinctionInterface = false,
+
+                    SubjectVisitId = x.SubjectVisitId,
+
+                    ObjectRelationParentId = x.SubjectVisitId,
+
+                    ObjectRelationParentId2 = x.ClinicalDataTrialSetId,
+
+                }, new
+                {
+                    Type = ClinicalFileType.PreviousSurgery
+                });
+            }
+
+            // 既往放疗史
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousHistory)))
+            {
+
+                var type = GetEntityAuditOpt(item);
+
+                var entity = item.Entity as PreviousHistory;
+
+                await InsertInspection<PreviousHistory>(entity, type, x => new InspectionConvertDTO()
+                {
+
+
+                    IsDistinctionInterface = false,
+
+                    SubjectVisitId = x.SubjectVisitId,
+
+                    ObjectRelationParentId2 = x.ClinicalDataTrialSetId,
+
+                    ObjectRelationParentId = x.SubjectVisitId,
+                }, new
+                {
+                    Type = ClinicalFileType.PreviousHistory
+                });
+            }
+
+            // 其他治疗史
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousOther)))
+            {
+                var type = GetEntityAuditOpt(item);
+
+                var entity = item.Entity as PreviousOther;
+
+                await InsertInspection<PreviousOther>(entity, type, x => new InspectionConvertDTO()
+                {
+
+                    IsDistinctionInterface = false,
+
+                    SubjectVisitId = x.SubjectVisitId,
+
+                    ObjectRelationParentId2 = x.ClinicalDataTrialSetId,
+
+                    ObjectRelationParentId = x.SubjectVisitId,
+                }, new
+                {
+                    Type = ClinicalFileType.PreviousOther
+                });
+            }
+           
+            #endregion
 
             #region 阅片人入组