优化

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Report.java

@@ -21,7 +21,13 @@ public class Report{
     private Long id;
 
     @ApiModelProperty(value = "就诊卡号")
-    private String cardId;
+    private Long cardId;
+
+    @ApiModelProperty(value = "就诊id")
+    private Long visitId;
+
+    @ApiModelProperty(value = "患者id")
+    private Long patId;
 
     @ApiModelProperty(value = "报告单号")
     private String reportNo;

ruoyi-admin/src/main/resources/mapper/work/RequestMapper.xml

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             tb_obr_request obr
             LEFT JOIN tb_orc_report orc ON obr.orc_id = orc.id
-            LEFT JOIN tb_visit vi ON orc.pat_id = vi.pat_id
+            LEFT JOIN tb_visit vi ON orc.visit_id = vi.id
         WHERE
             orc.pat_id = #{patId}
         <if test="startTime != null and endTime != null">