From e3974d9d44db666814e7e89fca612fe3e65b746f Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Tue, 3 Mar 2026 14:12:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=8E=A5pdf?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/system/domain/dto/RmsDto.java | 6 +-- .../com/ccsens/system/domain/vo/RmsVo.java | 19 ++++++++ .../admin/controller/ReportPdfController.java | 14 ++++-- .../com/ccsens/admin/persist/dao/RmsDao.java | 4 ++ .../com/ccsens/admin/service/IRmsService.java | 2 +- .../admin/service/impl/RmsServiceImpl.java | 20 ++------ .../src/main/resources/mapper/dao/RmsDao.xml | 48 +++++++++++++++++++ 7 files changed, 91 insertions(+), 22 deletions(-) diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java index a903baa..9bc666b 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java @@ -256,10 +256,10 @@ public class RmsDto { @ApiModel("导出历史报告单-DTO") @Data public static class ReportPDF{ - @ApiModelProperty("患者的就诊流水号") + @ApiModelProperty("患者唯一标识") private String patientNo; - @ApiModelProperty("医护人员工号") - private String emplCode; + @ApiModelProperty("就诊流水号") + private String visitNo; } } diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java index 60f71f6..6696d17 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java @@ -1148,4 +1148,23 @@ public class RmsVo { private Integer optionNum; } + @ApiModel("导出历史报告单（对接）-VO") + @Data + public static class ReportPDF{ + @ApiModelProperty("患者名称") + private String patientName; + @ApiModelProperty("性别") + private Byte sex; + @ApiModelProperty("年龄") + private int Age; + @ApiModelProperty("就诊号") + private String visitNo; + @ApiModelProperty("评估人") + private String assessor; + @ApiModelProperty("评估时间") + private String assessTime; + @ApiModelProperty("报告单文件路径") + private String url; + } + } diff --git a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/ReportPdfController.java b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/ReportPdfController.java index 256eabe..f944859 100644 --- a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/ReportPdfController.java +++ b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/ReportPdfController.java @@ -2,13 +2,17 @@ package com.ccsens.admin.controller; import com.ccsens.admin.service.IRmsService; import com.ccsens.common.annotation.Anonymous; +import com.ccsens.common.core.domain.BaseDto; import com.ccsens.common.core.domain.JsonResponse; +import com.ccsens.system.domain.dto.PmsPatientDto; import com.ccsens.system.domain.dto.RmsDto; import com.ccsens.system.domain.vo.RmsVo; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,6 +20,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.List; + +import static com.github.pagehelper.page.PageMethod.startPage; /** * @author zy @@ -32,9 +39,10 @@ public class ReportPdfController { @Anonymous @ApiOperation(value = "通过就诊号查询患者的评估报告单",notes = "") @PostMapping(value="/reportPDF") - public JsonResponse generate(@RequestBody @ApiParam @Valid RmsDto.ReportPDF dto){ + public JsonResponse> generate(@RequestBody @Validated BaseDto dto){ log.info("通过就诊号查询患者的评估报告单：{}", dto); - String url = rmsService.viewReportPDF(dto); - return JsonResponse.ok(url); + startPage(dto); + List list = rmsService.viewReportPDF(dto.getParam()); + return JsonResponse.ok(new PageInfo<>(list)); } } diff --git a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/persist/dao/RmsDao.java b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/persist/dao/RmsDao.java index 32ef17a..ae85805 100644 --- a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/persist/dao/RmsDao.java +++ b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/persist/dao/RmsDao.java @@ -88,4 +88,8 @@ public interface RmsDao { * @return */ List queryRecord(@Param("evaluationId")Long evaluationId, @Param("questionId")Long questionId); + + List viewReportPdfByVisitNo(@Param("visitNo")String visitNo); + + List viewReportPdfByPatientNo(@Param("patientNo")String patientNo); } diff --git a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/IRmsService.java b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/IRmsService.java index 1dc72dc..be562d5 100644 --- a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/IRmsService.java +++ b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/IRmsService.java @@ -38,7 +38,7 @@ public interface IRmsService { Workbook exportAnalyse(List ids); - String viewReportPDF(RmsDto.ReportPDF dto); + List viewReportPDF(RmsDto.ReportPDF dto); } diff --git a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/RmsServiceImpl.java b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/RmsServiceImpl.java index bbd736b..4143d14 100644 --- a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/RmsServiceImpl.java +++ b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/RmsServiceImpl.java @@ -930,22 +930,12 @@ public class RmsServiceImpl implements IRmsService { } @Override - public String viewReportPDF(RmsDto.ReportPDF dto) { - if(StrUtil.isBlank(dto.getPatientNo())){ - throw new ServiceException("患者就诊号不能为空"); + public List viewReportPDF(RmsDto.ReportPDF dto) { + if(StrUtil.isNotBlank(dto.getVisitNo())){ + return rmsDao.viewReportPdfByVisitNo(dto.getVisitNo()); + }else{ + return rmsDao.viewReportPdfByPatientNo(dto.getPatientNo()); } - //根据就诊流水号查询患者的 - RmsReport report; - RmsReportExample example = new RmsReportExample(); - example.createCriteria().andVisitNoEqualTo(dto.getPatientNo()).andDelFlagEqualTo((byte) 0); - List reports = rmsReportMapper.selectByExample(example); - if (CollectionUtil.isNotEmpty(reports)) { - report = reports.get(0); - if(ObjectUtil.isNotNull(report)){ - return report.getUrl(); - } - } - return null; } private void dealMMSEScored(List analyses) { diff --git a/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml b/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml index 38611e3..3ce2c63 100644 --- a/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml +++ b/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml @@ -1183,4 +1183,52 @@ order by r.sort + + + + \ No newline at end of file