Merge remote-tracking branch 'origin/xc' into xc

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/mapper/LargeScreenDataMapper.java

@@ -44,4 +44,13 @@ public interface LargeScreenDataMapper extends MPJBaseMapper<LargeScreenData> {
      */
     List<Map<String, String>> selectEmployeeNumsByPhones(@Param("phones") List<String> phones);
 
+    /**
+     * 查询 EMP_CARE_EMP 表中 FIRST_AIDER_INFO 是否包含指定工号
+     *
+     * @param workNo 工号
+     * @return 命中记录数，大于 0 表示该工号是急救人员
+     */
+    @Select("SELECT COUNT(1) FROM AYGC_YWK.EMP_CARE_EMP WHERE DEL_FLAG = '0' AND FIRST_AIDER_INFO LIKE CONCAT('%', #{workNo}, '%')")
+    int countFirstAiderByWorkNo(@Param("workNo") String workNo);
+
 }

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java

@@ -936,9 +936,7 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
         if (StrUtil.isEmpty(workNo)) {
             return false;
         }
-        // todo 目前查的是关爱人员，后面换成急救人员需要改成查急救人员
-//        return baseMapper.countByAdminNum(workNo) > 0;
-        return true;
+        return baseMapper.countFirstAiderByWorkNo(workNo) > 0;
     }
 
     @Override