From af74c91354251decbe87097d90e7f9e337885e35 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Tue, 3 Mar 2026 18:01:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/system/domain/dto/RmsDto.java | 13 ++++++++ .../com/ccsens/system/domain/vo/RmsVo.java | 16 ++++++++- .../admin/controller/ReportPdfController.java | 11 ++++++- .../com/ccsens/admin/service/IRmsService.java | 1 + .../admin/service/impl/RmsServiceImpl.java | 33 ++++++++++++++----- .../src/main/resources/mapper/dao/RmsDao.xml | 25 ++++++++++++-- 6 files changed, 86 insertions(+), 13 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 9bc666b..e05e6a6 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 @@ -262,4 +262,17 @@ public class RmsDto { private String visitNo; } + @ApiModel("导出历史报告单(查看详细的报告单文件)-DTO") + @Data + public static class queryPdfUrl{ + @ApiModelProperty("报告单ID") + private Long reportId; + @ApiModelProperty("测评ID") + private Long evaluationId; + @ApiModelProperty("导出类型 0医生版 1个人版 2阳性版") + private String version; + @ApiModelProperty("评估医生id") + private Long assessorId; + } + } 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 6696d17..0ea9017 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 @@ -1151,15 +1151,29 @@ public class RmsVo { @ApiModel("导出历史报告单（对接）-VO") @Data public static class ReportPDF{ + @ApiModelProperty("报告单ID") + private Long reportId; + @ApiModelProperty("测评ID") + private Long evaluationId; @ApiModelProperty("患者名称") private String patientName; @ApiModelProperty("性别") private Byte sex; @ApiModelProperty("年龄") private int Age; + @ApiModelProperty("出生日期") + private String birthDate; + @ApiModelProperty("身份证号") + private String idCard; + @ApiModelProperty("就诊类型 0门诊 1住院") + private Byte visitType; @ApiModelProperty("就诊号") private String visitNo; - @ApiModelProperty("评估人") + @ApiModelProperty("部门") + private String department; + @ApiModelProperty("评估医生Id") + private String assessorId; + @ApiModelProperty("评估医生") private String assessor; @ApiModelProperty("评估时间") private String assessTime; 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 f944859..3bcfb7e 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 @@ -39,10 +39,19 @@ public class ReportPdfController { @Anonymous @ApiOperation(value = "通过就诊号查询患者的评估报告单",notes = "") @PostMapping(value="/reportPDF") - public JsonResponse> generate(@RequestBody @Validated BaseDto dto){ + public JsonResponse> reportPDF(@RequestBody @Validated BaseDto dto){ log.info("通过就诊号查询患者的评估报告单：{}", dto); startPage(dto); List list = rmsService.viewReportPDF(dto.getParam()); return JsonResponse.ok(new PageInfo<>(list)); } + + @Anonymous + @ApiOperation(value = "通过就诊号查询患者的评估报告单",notes = "") + @PostMapping(value="/queryPdfUrl") + public JsonResponse queryPdfUrl(@RequestBody @Validated BaseDto dto){ + log.info("通过就诊号查询患者的评估报告单：{}", dto); + String url = rmsService.queryPdfUrl(dto.getParam()); + return JsonResponse.ok(url); + } } 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 be562d5..3e45f3d 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 @@ -41,4 +41,5 @@ public interface IRmsService { List viewReportPDF(RmsDto.ReportPDF dto); + String queryPdfUrl(RmsDto.queryPdfUrl param); } 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 4143d14..1dfb672 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 @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.ccsens.admin.persist.dao.RmsDao; @@ -14,10 +13,7 @@ import com.ccsens.common.config.AppConfig; import com.ccsens.common.constant.CultureEnum; import com.ccsens.common.constant.ErrorConstant; import com.ccsens.common.constant.GenConstants; -import com.ccsens.common.constant.JobEnum; import com.ccsens.common.core.redis.RedisCache; -import com.ccsens.common.enums.BaseEnum; -import com.ccsens.common.exception.ServiceException; import com.ccsens.common.exception.base.BaseException; import com.ccsens.common.utils.*; import com.ccsens.system.domain.dto.AmsDto; @@ -25,12 +21,9 @@ import com.ccsens.system.domain.dto.RmsDto; import com.ccsens.system.domain.po.*; import com.ccsens.system.domain.vo.AmsReportVo; import com.ccsens.system.domain.vo.AmsVo; -import com.ccsens.admin.domain.vo.LdPatientExportVo; import com.ccsens.system.domain.vo.HmsVo; import com.ccsens.system.domain.vo.RmsVo; import com.ccsens.system.persist.mapper.*; -import com.deepoove.poi.XWPFTemplate; -import com.deepoove.poi.data.*; import com.github.pagehelper.util.StringUtil; import com.itextpdf.text.BadElementException; import com.itextpdf.text.Image; @@ -70,6 +63,8 @@ public class RmsServiceImpl implements IRmsService { @Resource private RmsReportMapper rmsReportMapper; @Resource + private IRmsService rmsService; + @Resource private RmsDao rmsDao; @Resource private PmsPatientMapper pmsPatientMapper; @@ -89,7 +84,6 @@ public class RmsServiceImpl implements IRmsService { private HmsDoctorSignMapper hmsDoctorSignMapper; @Resource private ScoreService scoreService; - @Value("${informed.prefixWord}") private String prefixWord; @@ -938,6 +932,29 @@ public class RmsServiceImpl implements IRmsService { } } + @Override + public String queryPdfUrl(RmsDto.queryPdfUrl dto) { + RmsReport report = rmsReportMapper.selectByPrimaryKey(dto.getReportId()); + if (ObjectUtil.isNotNull(report) && StrUtil.isNotBlank(report.getUrl())) { + return report.getUrl(); + } + String url = ""; + //根据医生id查找医生的签名id + if(ObjectUtil.isNotNull(dto.getAssessorId())){ +// List querySigns = hmsDoctorDao.querySign(dto.getAssessorId()); +// if(CollUtil.isNotEmpty(querySigns)){ +// //生成文件 +// RmsDto.ExportReport1Dto exportReport1Dto = new RmsDto.ExportReport1Dto(); +// exportReport1Dto.setReportId(dto.getReportId()); +// exportReport1Dto.setEvaluationId(dto.getEvaluationId()); +// exportReport1Dto.setSignId(querySigns.get(0).getSignId()); +// AmsReportVo.Result result = amsReportService.exportYs(exportReport1Dto); +// url = result.getPath(); +// } + } + return url; + } + private void dealMMSEScored(List analyses) { analyses.forEach(analyse -> { List mmseScores = analyse.getMmseScores(); 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 3ce2c63..68789a4 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 @@ -1186,12 +1186,19 @@ \ No newline at end of file From 69cdd0587ceb307d506a5a7fa331ccb152136e97 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Wed, 4 Mar 2026 09:23:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruisi-web-admin/src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruisi_java/ruisi-web-admin/src/main/resources/application-dev.yml b/ruisi_java/ruisi-web-admin/src/main/resources/application-dev.yml index 4e26ec1..2e5a1a9 100644 --- a/ruisi_java/ruisi-web-admin/src/main/resources/application-dev.yml +++ b/ruisi_java/ruisi-web-admin/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ spring: master: url: jdbc:mysql://localhost:3306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: q7510327 + password: 123456 # url: jdbc:mysql://localhost:3306/htage2023?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: root # password: 123456