新增

1、九防分页接口增加风险程度过滤

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/asphyxiationbychoking/ElderlyAsphyxiationByChokingPageReqVO.java

@@ -30,6 +30,9 @@ public class ElderlyAsphyxiationByChokingPageReqVO extends PageParam {
     @Schema(description = "长者id")
     private Long elderId;
 
+    @Schema(description = "风险程度")
+    private String risk;
+
     @Schema(description = "机构id数组")
     private Long[] tenantIds;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/assessment/ElderlyAssessmentPageReqVO.java

@@ -33,6 +33,9 @@ public class ElderlyAssessmentPageReqVO extends PageParam {
     @Schema(description = "楼层id")
     private Long floorId;
 
+    @Schema(description = "风险程度")
+    private String risk;
+
     @Schema(description = "机构id数组")
     private Long[] tenantIds;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlyassessattackriskfactors/ElderlyAssessAttackRiskFactorsPageReqVO.java

@@ -33,6 +33,9 @@ public class ElderlyAssessAttackRiskFactorsPageReqVO extends PageParam {
     @Schema(description = "楼层id")
     private Long floorId;
 
+    @Schema(description = "风险程度")
+    private String risk;
+
     @Schema(description = "机构id数组")
     private Long[] tenantIds;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlyassessperceptioncommunication/ElderlyAssessPerceptionCommunicationPageReqVO.java

@@ -33,6 +33,9 @@ public class ElderlyAssessPerceptionCommunicationPageReqVO extends PageParam {
     @Schema(description = "楼层id")
     private Long floorId;
 
+    @Schema(description = "风险程度")
+    private String risk;
+
     @Schema(description = "机构id数组")
     private Long[] tenantIds;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlyassesssimplementalstate/ElderlyAssessSimpleMentalStatePageReqVO.java

@@ -33,6 +33,9 @@ public class ElderlyAssessSimpleMentalStatePageReqVO extends PageParam {
     @Schema(description = "楼层id")
     private Long floorId;
 
+    @Schema(description = "风险程度")
+    private String risk;
+
     @Schema(description = "机构id数组")
     private Long[] tenantIds;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlyassesssuiciderisk/ElderlyAssessSuicideRiskPageReqVO.java

@@ -33,6 +33,9 @@ public class ElderlyAssessSuicideRiskPageReqVO extends PageParam {
     @Schema(description = "楼层id")
     private Long floorId;
 
+    @Schema(description = "风险程度")
+    private String risk;
+
     @Schema(description = "机构id数组")
     private Long[] tenantIds;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/pressuresores/ElderlyPressureSoresPageReqVO.java

@@ -30,6 +30,9 @@ public class ElderlyPressureSoresPageReqVO extends PageParam {
     @Schema(description = "长者id")
     private Long elderId;
 
+    @Schema(description = "风险程度")
+    private String risk;
+
     @Schema(description = "机构id数组")
     private Long[] tenantIds;
 }

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

@@ -18,6 +18,9 @@ public class ElderlyRiskDisclosureStatementPageReqVO extends PageParam {
     @Schema(description = "楼层id")
     private Long floorId;
 
+    @Schema(description = "风险（模糊，匹配第一次/第二次告知风险）")
+    private String risk;
+
     @Schema(description = "机构id数组")
     private Long[] tenantIds;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyAssessAttackRiskFactorsMapper.java

@@ -16,6 +16,7 @@ public interface ElderlyAssessAttackRiskFactorsMapper extends BaseMapperX<Elderl
                 .likeIfPresent(ElderlyAssessAttackRiskFactorsDO::getAssessor, reqVO.getAssessor())
                 .betweenIfPresent(ElderlyAssessAttackRiskFactorsDO::getAssessDate, reqVO.getAssessDate())
                 .eqIfPresent(ElderlyAssessAttackRiskFactorsDO::getElderId, reqVO.getElderId())
+                .eqIfPresent(ElderlyAssessAttackRiskFactorsDO::getRiskLevel, reqVO.getRisk())
                 .inIfPresent(ElderlyAssessAttackRiskFactorsDO::getTenantId, reqVO.getTenantIds())
                 .inSql(reqVO.getFloorId() != null, ElderlyAssessAttackRiskFactorsDO::getElderId,
                         "SELECT id FROM elderly_info WHERE floor_id = " + reqVO.getFloorId())

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyAssessPerceptionCommunicationMapper.java

@@ -16,6 +16,7 @@ public interface ElderlyAssessPerceptionCommunicationMapper extends BaseMapperX<
                 .likeIfPresent(ElderlyAssessPerceptionCommunicationDO::getAssessor, reqVO.getAssessor())
                 .betweenIfPresent(ElderlyAssessPerceptionCommunicationDO::getAssessDate, reqVO.getAssessDate())
                 .eqIfPresent(ElderlyAssessPerceptionCommunicationDO::getElderId, reqVO.getElderId())
+                .eqIfPresent(ElderlyAssessPerceptionCommunicationDO::getRiskLevel, reqVO.getRisk())
                 .inIfPresent(ElderlyAssessPerceptionCommunicationDO::getTenantId, reqVO.getTenantIds())
                 .inSql(reqVO.getFloorId() != null, ElderlyAssessPerceptionCommunicationDO::getElderId,
                         "SELECT id FROM elderly_info WHERE floor_id = " + reqVO.getFloorId())

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyAssessSimpleMentalStateMapper.java

@@ -16,6 +16,7 @@ public interface ElderlyAssessSimpleMentalStateMapper extends BaseMapperX<Elderl
                 .likeIfPresent(ElderlyAssessSimpleMentalStateDO::getAssessor, reqVO.getAssessor())
                 .betweenIfPresent(ElderlyAssessSimpleMentalStateDO::getAssessDate, reqVO.getAssessDate())
                 .eqIfPresent(ElderlyAssessSimpleMentalStateDO::getElderId, reqVO.getElderId())
+                .eqIfPresent(ElderlyAssessSimpleMentalStateDO::getRiskLevel, reqVO.getRisk())
                 .inIfPresent(ElderlyAssessSimpleMentalStateDO::getTenantId, reqVO.getTenantIds())
                 .inSql(reqVO.getFloorId() != null, ElderlyAssessSimpleMentalStateDO::getElderId,
                         "SELECT id FROM elderly_info WHERE floor_id = " + reqVO.getFloorId())

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyAssessSuicideRiskMapper.java

@@ -16,6 +16,7 @@ public interface ElderlyAssessSuicideRiskMapper extends BaseMapperX<ElderlyAsses
                 .likeIfPresent(ElderlyAssessSuicideRiskDO::getAssessor, reqVO.getAssessor())
                 .betweenIfPresent(ElderlyAssessSuicideRiskDO::getAssessDate, reqVO.getAssessDate())
                 .eqIfPresent(ElderlyAssessSuicideRiskDO::getElderId, reqVO.getElderId())
+                .eqIfPresent(ElderlyAssessSuicideRiskDO::getRiskLevel, reqVO.getRisk())
                 .inIfPresent(ElderlyAssessSuicideRiskDO::getTenantId, reqVO.getTenantIds())
                 .inSql(reqVO.getFloorId() != null, ElderlyAssessSuicideRiskDO::getElderId,
                         "SELECT id FROM elderly_info WHERE floor_id = " + reqVO.getFloorId())

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

@@ -39,6 +39,9 @@
         <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
             AND eae.assess_date &lt;= #{reqVO.assessDate[1]}
         </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND eae.risk_level = #{reqVO.risk}
+        </if>
         ORDER BY eae.assess_date DESC, eae.id DESC
     </select>
 

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

@@ -36,6 +36,9 @@
         <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
             AND eabc.assess_date &lt;= #{reqVO.assessDate[1]}
         </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND eabc.risk_level = #{reqVO.risk}
+        </if>
         ORDER BY eabc.assess_date DESC, eabc.id DESC
     </select>
 

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

@@ -36,6 +36,9 @@
         <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
             AND edl.assess_date &lt;= #{reqVO.assessDate[1]}
         </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND edl.risk_level = #{reqVO.risk}
+        </if>
         ORDER BY edl.assess_date DESC, edl.id DESC
     </select>
 

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

@@ -36,6 +36,9 @@
         <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
             AND ee.assess_date &lt;= #{reqVO.assessDate[1]}
         </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND ee.risk_level = #{reqVO.risk}
+        </if>
         ORDER BY ee.assess_date DESC, ee.id DESC
     </select>
 

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

@@ -36,6 +36,9 @@
         <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
             AND ee.assess_date &lt;= #{reqVO.assessDate[1]}
         </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND ee.risk_level = #{reqVO.risk}
+        </if>
         ORDER BY ee.assess_date DESC, ee.id DESC
     </select>
 

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

@@ -36,6 +36,9 @@
         <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
             AND efd.assess_date &lt;= #{reqVO.assessDate[1]}
         </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND efd.risk_level = #{reqVO.risk}
+        </if>
         ORDER BY efd.assess_date DESC, efd.id DESC
     </select>
 

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

@@ -36,6 +36,9 @@
         <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
             AND efpm.assess_date &lt;= #{reqVO.assessDate[1]}
         </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND efpm.risk_level = #{reqVO.risk}
+        </if>
         ORDER BY efpm.assess_date DESC, efpm.id DESC
     </select>
 

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

@@ -36,6 +36,9 @@
         <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
             AND enr.assess_date &lt;= #{reqVO.assessDate[1]}
         </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND enr.risk_level = #{reqVO.risk}
+        </if>
         ORDER BY enr.assess_date DESC, enr.id DESC
     </select>
 

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

@@ -36,6 +36,9 @@
         <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
             AND eps.assess_date &lt;= #{reqVO.assessDate[1]}
         </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND eps.risk_level = #{reqVO.risk}
+        </if>
         ORDER BY eps.assess_date DESC, eps.id DESC
     </select>
 

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

@@ -48,6 +48,10 @@
         <if test="reqVO.floorId != null">
             AND obf.id = #{reqVO.floorId}
         </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND (erds.first_risk LIKE CONCAT('%', #{reqVO.risk}, '%')
+                OR erds.second_risk LIKE CONCAT('%', #{reqVO.risk}, '%'))
+        </if>
         ORDER BY erds.create_time DESC, erds.id DESC
     </select>
 

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

@@ -36,6 +36,9 @@
         <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
             AND ewa.assess_date &lt;= #{reqVO.assessDate[1]}
         </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND ewa.risk_level = #{reqVO.risk}
+        </if>
         ORDER BY ewa.assess_date DESC, ewa.id DESC
     </select>