diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/dao/CaseplatformCaseExamineDao.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/dao/CaseplatformCaseExamineDao.java new file mode 100644 index 0000000..39adfe4 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/dao/CaseplatformCaseExamineDao.java @@ -0,0 +1,28 @@ +package net.lab1024.sa.admin.module.business.caseplatformcase.dao; + +import java.util.List; + +import net.lab1024.sa.admin.module.business.caseplatformcase.domain.entity.CaseplatformCaseExamineEntity; +import net.lab1024.sa.admin.module.business.caseplatformcase.domain.entity.CaseplatformCaseExamineEntity; +import net.lab1024.sa.admin.module.business.caseplatformcase.domain.vo.CaseplatformCaseExamineVO; +import net.lab1024.sa.admin.module.business.caseplatformcase.domain.vo.CaseplatformCaseExamineVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; + +/** + * 审核记录 Dao + * + * @Author xing + * @Date 2025-08-18 08:15:28 + * @Copyright gdxz + */ + +@Mapper +@Component +public interface CaseplatformCaseExamineDao extends BaseMapper { + + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/entity/CaseplatformCaseExamineEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/entity/CaseplatformCaseExamineEntity.java new file mode 100644 index 0000000..babcd66 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/entity/CaseplatformCaseExamineEntity.java @@ -0,0 +1,45 @@ +package net.lab1024.sa.admin.module.business.caseplatformcase.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 审核记录 实体类 + * + * @Author xing + * @Date 2025-08-18 08:15:28 + * @Copyright gdxz + */ + +@Data +@TableName("t_caseplatform_case_examine") +public class CaseplatformCaseExamineEntity { + /** + * 主键id + */ + @TableId + private Long id; + + /** + * 病例id + */ + private Long caseId; + + /** + * 原因 + */ + private String reason; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseExamineVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseExamineVO.java new file mode 100644 index 0000000..d7325b5 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseExamineVO.java @@ -0,0 +1,34 @@ +package net.lab1024.sa.admin.module.business.caseplatformcase.domain.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 审核记录 列表VO + * + * @Author xing + * @Date 2025-08-18 08:15:28 + * @Copyright gdxz + */ + +@Data + +public class CaseplatformCaseExamineVO { + @ApiModelProperty(value = "主键id") + private Long id; + + @ApiModelProperty(value = "病例id") + private Long caseId; + + @ApiModelProperty(value = "原因") + private String reason; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "修改时间") + private LocalDateTime updateTime; + +} 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 f53bb9d..27ef4a5 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 @@ -4,6 +4,9 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.ExcelTarget; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + import lombok.Data; import net.lab1024.sa.admin.module.business.caseplatformcase.constant.CaseStatusEnum; import net.lab1024.sa.admin.module.business.caseplatformcase.constant.CasetypeEnum; @@ -61,6 +64,9 @@ public class CaseplatformCaseVO { @ApiModelProperty(value = "原因") private String reason; + @ApiModelProperty(value = "审核原因") + private List CaseplatformCaseExamineList = new ArrayList<>(); + @ApiModelProperty(value = "结算标识") private Integer settlementFlag; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/manager/CaseplatformCaseExamineManager.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/manager/CaseplatformCaseExamineManager.java new file mode 100644 index 0000000..43f9a52 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/manager/CaseplatformCaseExamineManager.java @@ -0,0 +1,20 @@ +package net.lab1024.sa.admin.module.business.caseplatformcase.manager; + +import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformCaseExamineDao; +import net.lab1024.sa.admin.module.business.caseplatformcase.domain.entity.CaseplatformCaseExamineEntity; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 审核记录 Manager + * + * @Author xing + * @Date 2025-08-18 08:15:28 + * @Copyright gdxz + */ +@Service +public class CaseplatformCaseExamineManager extends ServiceImpl { + + +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseExamineService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseExamineService.java new file mode 100644 index 0000000..16a2e27 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseExamineService.java @@ -0,0 +1,31 @@ +package net.lab1024.sa.admin.module.business.caseplatformcase.service; + +import java.util.List; + +import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformCaseExamineDao; +import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformCaseExamineDao; +import net.lab1024.sa.admin.module.business.caseplatformcase.domain.entity.CaseplatformCaseExamineEntity; +import net.lab1024.sa.admin.module.business.caseplatformcase.domain.vo.CaseplatformCaseExamineVO; +import net.lab1024.sa.common.common.util.SmartPageUtil; +import net.lab1024.sa.common.common.domain.PageResult; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 审核记录 Service + * + * @Author xing + * @Date 2025-08-18 08:15:28 + * @Copyright gdxz + */ + +@Service +public class CaseplatformCaseExamineService { + + @Autowired + private CaseplatformCaseExamineDao caseplatformCaseExamineDao; + + + +} 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 d92b229..1cf1342 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 @@ -24,8 +24,10 @@ 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.dao.CaseplatformAcAppDao; import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformCaseDao; +import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformCaseExamineDao; import net.lab1024.sa.admin.module.business.caseplatformcase.domain.entity.CaseplatformAcAppEntity; import net.lab1024.sa.admin.module.business.caseplatformcase.domain.entity.CaseplatformCaseEntity; +import net.lab1024.sa.admin.module.business.caseplatformcase.domain.entity.CaseplatformCaseExamineEntity; import net.lab1024.sa.admin.module.business.caseplatformcase.domain.form.*; import net.lab1024.sa.admin.module.business.caseplatformcase.domain.vo.*; import net.lab1024.sa.admin.module.business.caseplatformcaseabstrac.domain.vo.CaseplatformCaseAbstracVO; @@ -113,6 +115,9 @@ public class CaseplatformCaseService { @Resource private ExpertWhiteEntityService expertWhiteEntityService; + @Resource + private CaseplatformCaseExamineDao caseplatformCaseExamineDao; + // 创建 ObjectMapper 实例（建议使用 Spring 注入或静态常量） private static final ObjectMapper objectMapper = new ObjectMapper(); @@ -154,6 +159,17 @@ public class CaseplatformCaseService { } List list = caseplatformCaseDao.queryPage(page, queryForm, provList); + for (CaseplatformCaseVO caseplatformCaseVO : list) { + // 获取审核失败原因 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CaseplatformCaseExamineEntity::getCaseId, caseplatformCaseVO.getId()); + List caseplatformCaseExamines = caseplatformCaseExamineDao.selectList(queryWrapper); + if (caseplatformCaseExamines != null && !caseplatformCaseExamines.isEmpty()) { + List caseplatformCaseExamineVOs = SmartBeanUtil.copyList(caseplatformCaseExamines, CaseplatformCaseExamineVO.class); + caseplatformCaseVO.setCaseplatformCaseExamineList(caseplatformCaseExamineVOs); + } + } + PageResult pageResult = SmartPageUtil.convert2PageResult(page, list); return ResponseDTO.ok(pageResult); } diff --git a/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseExamineMapper.xml b/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseExamineMapper.xml new file mode 100644 index 0000000..7eb016b --- /dev/null +++ b/sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseExamineMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file