急救

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()) {