合并后端

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;
+            }
+        }
     }
 }

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