From c0055bb6116a18ce4dc1714ae5900073bc2a62d6 Mon Sep 17 00:00:00 2001
From: zhangye <654600784@qq.com>
Date: Wed, 4 Mar 2026 18:08:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ccsens/system/domain/vo/RmsVo.java | 12 +++++++++++-
 .../src/main/resources/mapper/dao/RmsDao.xml         |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

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 b3aaf37..ac1f7ab 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
@@ -1278,7 +1278,7 @@ public class RmsVo {
 
     @ApiModel("导出历史报告单（对接）-VO")
     @Data
-    public static class ReportPDF{
+    public static class ReportPDF {
         @ApiModelProperty("报告单ID")
         private Long reportId;
         @ApiModelProperty("测评ID")
@@ -1303,9 +1303,19 @@ public class RmsVo {
         private String assessorId;
         @ApiModelProperty("评估医生")
         private String assessor;
+        @ApiModelProperty("评估医生编号")
+        private String assessorCode;
         @ApiModelProperty("评估时间")
         private String assessTime;
         @ApiModelProperty("报告单文件路径")
         private String url;
+
+        public String getAssessor() {
+            if (StrUtil.isNotEmpty(assessorCode)) {
+                return assessor + "(" + assessorCode + ")";
+            }else {
+                return assessor;
+            }
+        }
     }
 }
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 336e4a9..3e32ccc 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
@@ -1555,6 +1555,7 @@ d.dept_name                as hospitalName
             b.department,
             u.user_id as assessorId,
             u.nick_name as assessor,
+            u.empl_code as assessorCode,
             FROM_UNIXTIME(r.report_time /1000, '%Y-%m-%d %H:%i:%s') as assessTime,
             r.url