diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformCaseController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformCaseController.java index e2c4029..013876c 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformCaseController.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformCaseController.java @@ -78,8 +78,7 @@ public class CaseplatformCaseController { @PostMapping("/caseplatformCase/cancelExamine") @PreAuthorize("@saAuth.checkPermission('case-system:case:examine')") public ResponseDTO cancelExamine(@RequestBody @Valid CancelExamineForm form) { - caseplatformCaseService.cancelExamine(form); - return ResponseDTO.ok(); + return caseplatformCaseService.cancelExamine(form); } // @ApiOperation("导出excle @author HMM") diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java index 6e562c6..68ca8db 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java @@ -412,6 +412,7 @@ public class CaseplatformCaseService { */ public ResponseDTO add(CaseplatformCaseAddForm addForm) { CaseplatformCaseEntity caseplatformCaseEntity = SmartBeanUtil.copy(addForm, CaseplatformCaseEntity.class); + caseplatformCaseEntity.setUpdateTime(LocalDateTime.now()); caseplatformCaseDao.insert(caseplatformCaseEntity); return ResponseDTO.ok(); } @@ -424,6 +425,7 @@ public class CaseplatformCaseService { */ public ResponseDTO update(CaseplatformCaseUpdateForm updateForm) { CaseplatformCaseEntity caseplatformCaseEntity = SmartBeanUtil.copy(updateForm, CaseplatformCaseEntity.class); + caseplatformCaseEntity.setUpdateTime(LocalDateTime.now()); caseplatformCaseDao.updateById(caseplatformCaseEntity); return ResponseDTO.ok(); } @@ -454,6 +456,7 @@ public class CaseplatformCaseService { caseplatformCase.setStatus(status); caseplatformCase.setExamineTime(LocalDateTime.now()); + caseplatformCase.setUpdateTime(LocalDateTime.now()); caseplatformCaseDao.updateById(caseplatformCase); return ResponseDTO.ok(); @@ -482,7 +485,9 @@ public class CaseplatformCaseService { return ResponseDTO.userErrorParam("该用户未签署协议"); } - caseplatformCaseDao.settlement(case_id); + caseplatformCase.setSettlementFlag(1); + caseplatformCase.setSettlementTime(LocalDateTime.now()); + caseplatformCase.setUpdateTime(LocalDateTime.now()); return ResponseDTO.ok(); } @@ -491,8 +496,18 @@ public class CaseplatformCaseService { * 审核拒绝 * @param form */ - public void cancelExamine(CancelExamineForm form){ + public ResponseDTO cancelExamine(CancelExamineForm form){ + // 获取病例数据 + CaseplatformCaseEntity caseplatformCase = caseplatformCaseDao.selectById(form.getCaseId()); + if (caseplatformCase == null) { + return ResponseDTO.userErrorParam("病例不存在"); + } + caseplatformCaseDao.cancelExamine(form); + + caseplatformCase.setUpdateTime(LocalDateTime.now()); + caseplatformCaseDao.updateById(caseplatformCase); + return ResponseDTO.ok(); } public ResponseDTO getDetail(Long case_id){