From 2e33b5f9ab3a0e43db7826f740f76dcb1c72d02c Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 20 Jul 2022 16:41:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/ReadingPeriodSetService.cs              | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs
index 44031502e..ebdcb2dfa 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs
@@ -298,11 +298,13 @@ namespace IRaCIS.Application.Services
         {
             if (indto.IsTakeEffect == ReadingPeriodStatus.TakeEffect)
             {
-                var readingPeriodSet = await _readingPeriodSetRepository.Where(x => x.Id == indto.Id).FirstOrDefaultAsync();
+
+               
+                var readingPeriodSet = await _readingPeriodSetRepository.Where(x => x.Id == indto.Id).FirstNotNullAsync();
                 var plans = _readingPeriodPlanRepository.Where(x => x.ReadingPeriodSetId == indto.Id).Include(x => x.SubjectVisit)
                     .Include(x => x.ReadingPeriodSet).Include(x => x.SubjectVisit).ToList();
                 var needAddVisitIds = plans.Select(x => x.SubjectVisitId).ToList();
-                var repeatVisitNames = _readModuleRepository.Where(x => x.ReadingSetType == ReadingSetType.ImageReading && needAddVisitIds.Contains(x.SubjectVisitId)).Select(x =>x.Subject.Code+"的"+  x.SubjectVisit.VisitName).ToList();
+                var repeatVisitNames = _readModuleRepository.Where(x => x.ReadingSetType == readingPeriodSet.ReadingSetType && needAddVisitIds.Contains(x.SubjectVisitId)).Select(x =>x.Subject.Code+"的"+  x.SubjectVisit.VisitName).ToList();
                 if(repeatVisitNames.Count!=0)
                 {
                     return ResponseOutput.NotOk($"{string.Join(",", repeatVisitNames)}已经添加过阅片期,无法设置生效");