新增了审核和结算时签名状态

sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformCaseController.java

@@ -64,16 +64,15 @@ public class CaseplatformCaseController {
     @GetMapping("/caseplatformCase/examine/{caseId}/{status}")
     @PreAuthorize("@saAuth.checkPermission('case-system:case:examine')")
     public ResponseDTO<String> examine(@PathVariable("caseId") Long caseId, @PathVariable("status") int status) {
-        caseplatformCaseService.examine(caseId, status);
+        return caseplatformCaseService.examine(caseId, status);
-        return ResponseDTO.ok();
     }
 
     @ApiOperation("结算 @author HMM")
     @GetMapping("/caseplatformCase/settlement/{caseId}")
     @PreAuthorize("@saAuth.checkPermission('case-system:case:settlement')")
     public ResponseDTO<String> settlement(@PathVariable("caseId") Long caseId) {
-        caseplatformCaseService.settlement(caseId);
+        return caseplatformCaseService.settlement(caseId);
-        return ResponseDTO.ok();
+
     }
 
     @ApiOperation("审核拒绝 @author HMM")

sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java

@@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import net.lab1024.sa.admin.module.app.expert.admin.ExpertWhiteEntity;
 import net.lab1024.sa.admin.module.app.expert.dao.CasePlatformBankDao;
 import net.lab1024.sa.admin.module.app.expert.dao.ExpertWhiteEntityDao;
+import net.lab1024.sa.admin.module.app.expert.dao.FxqSignDao;
 import net.lab1024.sa.admin.module.app.expert.domain.entity.CasePlatformBankEntity;
 import net.lab1024.sa.admin.module.app.expert.domain.entity.FxqSignEntity;
 import net.lab1024.sa.admin.module.app.medicalrecord.dao.MedicalRecorCheckDataDao;
@@ -54,6 +55,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.LocalDateTime;
@@ -102,6 +104,9 @@ public class CaseplatformCaseService {
     @Autowired
     private CaseplatformAcAppDao caseplatformAcAppDao;
 
+    @Resource
+    private FxqSignDao fxqSignDao;
+
     // 创建 ObjectMapper 实例（建议使用 Spring 注入或静态常量）
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
@@ -385,18 +390,56 @@ public class CaseplatformCaseService {
      * @param case_id
      * @return
      */
-    public void examine(Long case_id, int status){
+    public ResponseDTO<String> examine(Long case_id, int status){
+        // 获取病例数据
+        CaseplatformCaseEntity caseplatformCase = caseplatformCaseDao.selectById(case_id);
+        if (caseplatformCase == null) {
+            return ResponseDTO.userErrorParam("病例不存在");
+        }
+
+        // 获取用户签署协议状态
+        LambdaQueryWrapper<FxqSignEntity> signQueryWrapper = new LambdaQueryWrapper<>();
+        signQueryWrapper.eq(FxqSignEntity::getExpertId,caseplatformCase.getExpertId());
+        FxqSignEntity fxqSign = fxqSignDao.selectOne(signQueryWrapper);
+        if (fxqSign == null) {
+            return ResponseDTO.userErrorParam("该用户未签署协议");
+        }
+
+        if (fxqSign.getSignStatus() != 1){
+            return ResponseDTO.userErrorParam("该用户未签署协议");
+        }
+
         caseplatformCaseDao.examine(case_id, status);
+
+        return ResponseDTO.ok();
     }
 
     /**
      * 结算
      * @param case_id
      */
-    public void settlement(Long case_id){
+    public ResponseDTO<String> settlement(Long case_id){
         // 获取病例数据
+        CaseplatformCaseEntity caseplatformCase = caseplatformCaseDao.selectById(case_id);
+        if (caseplatformCase == null) {
+            return ResponseDTO.userErrorParam("病例不存在");
+        }
+
+        // 获取用户签署协议状态
+        LambdaQueryWrapper<FxqSignEntity> signQueryWrapper = new LambdaQueryWrapper<>();
+        signQueryWrapper.eq(FxqSignEntity::getExpertId,caseplatformCase.getExpertId());
+        FxqSignEntity fxqSign = fxqSignDao.selectOne(signQueryWrapper);
+        if (fxqSign == null) {
+            return ResponseDTO.userErrorParam("该用户未签署协议");
+        }
+
+        if (fxqSign.getSignStatus() != 1){
+            return ResponseDTO.userErrorParam("该用户未签署协议");
+        }
 
         caseplatformCaseDao.settlement(case_id);
+
+        return ResponseDTO.ok();
     }
 
     /**