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

2023-03-01 18:03:14 +08:00
parent 2251029356 57558af3eb
commit 4c4470af16
3 changed files with 40 additions and 7 deletions
@@ -592,6 +592,14 @@ namespace IRaCIS.Core.Application.Service
                {
                    IsClosedDialog = true,
                    MedicalDialogCloseEnum = MedicalDialogClose.IRApplyReReading,
+
+
+                    IsApplyHeavyReading = true,
+                    FileName = inDto.FileName,
+                    ImagePath = JsonConvert.SerializeObject(inDto.FileList),
+                    DisagreeReason = inDto.DisagreeReason,
+                  
+
                });
            }

@@ -683,10 +691,26 @@ namespace IRaCIS.Core.Application.Service
                AuditSignTime=DateTime.Now,
            });

-
-            await _trialEmailNoticeConfigService.BaseBusinessScenarioSendEmailAsync(medicalReviewInfo.VisitTaskId,  true&& medicalReviewInfo.IsApplyHeavyReading);
-
            var result = await _taskMedicalReviewRepository.SaveChangesAsync();
+
+            //自动发送邮件逻辑
+            if (medicalReviewInfo.IsAutoGenerate)
+            {
+
+                var allMedicalAuditList=  await _taskMedicalReviewRepository.Where(x => medicalReviewInfo.PDRelationTaskIdList.Contains(x.Id) ).ToListAsync();
+
+                if (allMedicalAuditList.All(t => t.IsApplyHeavyReading == false))
+                {
+                    //自动发送
+                    await _trialEmailNoticeConfigService.BaseBusinessScenarioSendEmailAsync(medicalReviewInfo.VisitTaskId, false);
+                }
+
+
+            }
+
+
+
+
            return ResponseOutput.Result(result);
        }