diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java index c8889af..4f0ba16 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import net.lab1024.sa.admin.module.app.expert.admin.ExpertSignVO; +import net.lab1024.sa.admin.module.app.expert.service.ExpertFxqService; import net.lab1024.sa.admin.module.app.expert.service.ExpertSignService; import net.lab1024.sa.admin.module.app.medicalrecord.dao.*; import net.lab1024.sa.admin.module.app.medicalrecord.domain.*; @@ -24,6 +25,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; +import javax.annotation.Resource; import java.time.Duration; import java.time.LocalDate; import java.time.LocalDateTime; @@ -58,6 +60,9 @@ public class MedicalRecordService { @Autowired private ConfigService configService; + @Resource + private ExpertFxqService expertFxqService; + @Autowired private ExpertSignService expertSignService; @@ -90,10 +95,12 @@ public class MedicalRecordService { Long expertId = SmartRequestUtil.getRequestUserId(); - ExpertSignVO expertSign = expertSignService.getExpertSign(); - if(expertSign == null){ + // 验证签名状态 + boolean isSign = expertFxqService.getExpertSign(expertId); + if (!isSign){ return ResponseDTO.userErrorParam("请先签署项目协议!"); } + /*************************前置 检查*****************************/ ResponseDTO check = check(SmartBeanUtil.copy(addForm, MedicalRecordUpdateForm.class), expertId);