新增

1、风险知情书模块分页新增合同号和护理等级显示

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/riskdisclosurestatement/ElderlyRiskDisclosureStatementRespVO.java

@@ -37,6 +37,12 @@ public class ElderlyRiskDisclosureStatementRespVO {
     @Schema(description = "床号")
     private String bedName;
 
+    @Schema(description = "合同号")
+    private String contractNumber;
+
+    @Schema(description = "护理等级")
+    private String nurseLevelName;
+
     @Schema(description = "服务安全风险知情告知书")
     private String riskData;
 

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyRiskDisclosureStatementMapper.xml

@@ -10,9 +10,27 @@
             ei.elder_sex AS elderSex,
             ei.elder_age AS elderAge,
             COALESCE(obf.floor_name, ei.floor_name) AS floorName,
-            COALESCE(CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name), ei.bed_name) AS bedName
+            COALESCE(CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name), ei.bed_name) AS bedName,
+            ec_latest.contract_number AS contractNumber,
+            ei.nurse_level_name AS nurseLevelName
         FROM elderly_risk_disclosure_statement erds
         LEFT JOIN elderly_info ei ON ei.id = erds.elder_id
+        LEFT JOIN (
+            SELECT
+                ec.*
+            FROM elderly_contract ec
+            INNER JOIN (
+                SELECT
+                    elder_id,
+                    tenant_id,
+                    MAX(created_time) AS max_created_time
+                FROM elderly_contract
+                WHERE status = 1
+                GROUP BY elder_id, tenant_id
+            ) t ON t.elder_id = ec.elder_id
+                AND t.tenant_id = ec.tenant_id
+                AND t.max_created_time = ec.created_time
+        ) ec_latest ON ec_latest.elder_id = erds.elder_id AND ec_latest.tenant_id = erds.tenant_id
         LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = erds.tenant_id
         LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
         LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id