From e4ea973f063081ed83be933d896765b855699efa Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Thu, 9 Sep 2021 11:01:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=A5=E6=95=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccsens/carbasics/service/FirstAidService.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ccsens/carbasics/service/FirstAidService.java b/src/main/java/com/ccsens/carbasics/service/FirstAidService.java
index 9a687a4..870e291 100644
--- a/src/main/java/com/ccsens/carbasics/service/FirstAidService.java
+++ b/src/main/java/com/ccsens/carbasics/service/FirstAidService.java
@@ -383,13 +383,12 @@ public class FirstAidService implements IFirstAidService{
 
         //判断病例是否已有医生加入
         FirstAidMember firstAidMember = firstAidMemberDao.findByAidId(param.getFirstAidId());
-        if (0 != firstAidMember.getRecordUserId() && ObjectUtil.isNotNull(firstAidMember.getRecordUserId())) {
+        FirstAid firstAidInfo = firstAidDao.selectByPrimaryKey(param.getFirstAidId());
+        if (0 != firstAidMember.getRecordUserId() && ObjectUtil.isNotNull(firstAidMember.getRecordUserId()) && firstAidInfo.getProjectId() != null && firstAidInfo.getProjectId() != 0) {
             throw new BaseException(DefaultCodeError.DOCTOR_HAS_JOINED);
         }
 
         //根据模板类型创建项目
-
-        FirstAid firstAidInfo = firstAidDao.selectByPrimaryKey(param.getFirstAidId());
         CProjectVo.CopyProjectInfo copyProjectInfo = new CProjectVo.CopyProjectInfo();
         //如果已有项目则不创建,使用旧项目
         if (firstAidInfo.getType().equals(param.getType()) && 0 != firstAidInfo.getProjectId()) {