From ce05b43dd5aa43bdb76dda84a86c2696d3606730 Mon Sep 17 00:00:00 2001 From: haomingming Date: Mon, 17 Nov 2025 16:41:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A1=E6=A0=B8=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/CaseplatformCaseVO.java | 3 +++ .../domain/vo/EasyExcelCaseDetailVO.java | 4 ++++ .../service/CaseplatformCaseService.java | 17 +++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java index e1a59e8..40ae77d 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java @@ -55,6 +55,9 @@ public class CaseplatformCaseVO { @ApiModelPropertyEnum(value = CaseStatusEnum.class, desc = "0待审核 1审核通过 2审核不通过") private Integer status; + @ApiModelProperty(value = "审核次数") + private int examineNum; + @ApiModelProperty(value = "审核通过时间") private LocalDateTime examineTime; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/EasyExcelCaseDetailVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/EasyExcelCaseDetailVO.java index c45b73d..78275fd 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/EasyExcelCaseDetailVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/EasyExcelCaseDetailVO.java @@ -72,6 +72,10 @@ public class EasyExcelCaseDetailVO { @ExcelProperty(value = "病例状态", converter = CaseStatusConverter.class) private Integer status; + @ApiModelPropertyEnum(value = CaseStatusEnum.class, desc = "审核次数") + @ExcelProperty("审核次数") + private Integer examineNum; + @ApiModelProperty(value = "审核通过时间") @ExcelProperty("审核时间") private LocalDateTime examineTime; 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 6c06fc5..9017bf8 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 @@ -22,6 +22,7 @@ import net.lab1024.sa.admin.module.app.medicalrecord.domain.MedicalRecordCheckda import net.lab1024.sa.admin.module.app.medicalrecord.domain.MedicalRecordDpmsEntity; import net.lab1024.sa.admin.module.app.medicalrecord.domain.MedicalRecordEntity; import net.lab1024.sa.admin.module.business.area.domain.vo.ProvVO; +import net.lab1024.sa.admin.module.business.caseplatformcase.constant.CaseStatusEnum; import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformAcAppDao; import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformCaseDao; import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformCaseExamineDao; @@ -168,6 +169,11 @@ public class CaseplatformCaseService { List caseplatformCaseExamineVOs = SmartBeanUtil.copyList(caseplatformCaseExamines, CaseplatformCaseExamineVO.class); caseplatformCaseVO.setCaseplatformCaseExamineList(caseplatformCaseExamineVOs); } + int examineNum = caseplatformCaseExamines.size(); + if(caseplatformCaseVO.getStatus() == CaseStatusEnum.PASS.getValue()){ + examineNum = examineNum + 1; + } + caseplatformCaseVO.setExamineNum(examineNum); } PageResult pageResult = SmartPageUtil.convert2PageResult(page, list); @@ -222,6 +228,17 @@ public class CaseplatformCaseService { } } List list = caseplatformCaseDao.excelList(queryForm, provList); + for (EasyExcelCaseDetailVO caseVO : list) { + // 获取审核失败原因 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CaseplatformCaseExamineEntity::getCaseId, caseVO.getId()); + List caseplatformCaseExamines = caseplatformCaseExamineDao.selectList(queryWrapper); + int examineNum = caseplatformCaseExamines.size(); + if(caseVO.getStatus() == CaseStatusEnum.PASS.getValue()){ + examineNum = examineNum + 1; + } + caseVO.setExamineNum(examineNum); + } return list; }